Merge pull request #21 from bowenal91/master

New reset ids added
draft of comp controller
Merge pull request #23 from dreid1991/master

compcontroller