Finished first go at adding work time support. Not yet tested.