Improved Commands, but coding right now