Got it back to a point where the major commands are working