Initial commit; contains what used to be in the command handler