Moved some things around and added the trailer into the build.