starting to add in cli files and move out single use code