more work done to parser. getting close, kinda