much of the way through a much improved fixie parser, will finish soon