Added logging
Refactored timing code to be a little more functional
Updated README and TODO