Implement CommandRunner for class
Fixes many bugs