Rewrite the cue parser, tests needed!!!