checkpoint
updates
Everything appears to work now with sticky state, just have lots of code cleanup to do before merging