Re-working old stuff while in between projects.