restructuring commands to use a prelude