Removed the 'Switch-timed' stuff. Never going to finish it anyway.