Modularized code, set up for eventual timer tests