Changing up architecture a lot