Modularized code, set up for eventual timer tests
Added options and changed the manifest