Worked on the Commands a little and some organization