A whole lot of work on the parser and cue object