added set selector, moved most atomic parsers