got parser working in a way that makes sense