Another intermediate checkin for the time constraint modules. This one is much better.