big commands refactor in prep for hackathon