Checkpoint for pushing to GH

WIP, I know this isn't done but wanted look and provide some feedback.