Phase One of Major Design Change
First round of bug fixes.
Round two of bug fixes.