Added most of the guts, still need the last part of the parser