Parser nearing completion, test arrays and resolve conflicts in parser