Add parse, bunch of other stuff