Revamp

Make the "build" cleaner and support yearly and persistent timers.