Big refactor. Nothing works anymore
Big refactor. This start to work a bit more