WIP brought management command into compliance with jrbl's PR comments, still need to implement dcadams'