Fixed parser, new OOP, new unit tests (some fail)