Merging with Axiom's master

Still need to make sure the start/end time stuff works as intended...