Completely redone the whole project. Merged all the things.