A lot of refactoring and restructuring esp. in the ClassParser. Started testing with larger code bases.