Everything syncing correctly.

HOPEFULLY THIS WILL BE OUR FINAL COMMIT BEFORE PRESENTATION WOOT!