fixed input parser
started work on controller