[#100] Huge refactoring, isn't working need to to back to the start