Switch to more semantic and speedy time methods.  Closes #2.