Moved the parser to a Base and Company class

Started working on testing.