Added roll verify and time commands, plus a lot of code reorganization