Handle command results by class instead of Func

[csmir]

Squash again, will clear the branch later

Closes #34