Begin seperation of logic for manager commands