Clean up and bugfix
Major update

Added ability to add, remove, and view timers, along with a major
re-architecturing to simplify the main loop.