breaking out into a separate file
adding associated commands into the mix