started trying to get things to sync and work right :)

This is my last commit before i got to spain :)