Lots of changes...not working. Need a checkpoint.
Checking in random latest changes.