Got the new parser in place but still need a lot of cleanup, commiting because I need to clear this hard-drive. Do not use this.