Last Sync for class

Fixed most of the changes on the to do list