first working refactor of Pacer
first working refactor of Pacer (added new files back into repo)