Major changes, the build is currently broken