Yes. Still needs soem refactoring, for sure. But ok to take to start testing now I think