Refactor parsing, move to opener