Added a bunch of stuff, started the parsing and what not