Parsing code second pass, category/assignment parsing implemented