Begin adding serverside clocks and do minor cleanup