Stuck on bug.

Working back on a few commits.