Most of the work is done, lack of commits dut to being on the train