Updated Parser to only be one class. More methods need worked on though.