Checkpoint

Saving off stuff mid-flight as I haven't worked on it in a while.