Replaced Command.cpp with function pointers

Needs cleaning!