Get rid of shitty command class.

Yay regex!