Attempt #2 at making commands work.