more in-progress parser work