Continue work on parsing, adding cases and setting up argument-reader.