Quick Sync

Pushing work so I can work on another machine in this branch