More refactoring and readme update

Things are buggy right now though (negative units of time in some cases)