edit todo
refactoring: remove Q from parser