Refactored parser setup and improved commands to actually work