Reworked half of the project. But not sure if it got better...