Spacing
Spacing
Spacing
Moving logic around to make things more sane.  It compiles, but probably doesn't run right now