Checkpoint commit - going to refractor the flags.
Wherein I obsessively reorder class variables, and some actually useful stuff too.
Flags are now bool's