Refactoring again, now removing my classes inovations. meh