Continue parser overhaul - redo touch command.