I think the timing fixes will take a fairly large restructuring of the logistics code, so I'm committing before starting any of that shiz