New Features

Lots of cleanup but still confusing
Needs on-demand check-for-changes to work