Restructure timing

Allows computers to correctly stay in sync.