Still fixing clock stuff