Further Work on Command Parsing

Rewrote command butcher to use the parsing system. This shows promise,
once I figure out how to handle the duplicate code.