Made New CommandBox mostly work. Still need some UI tweaking