Updates to mechanics and syncing #2