Moved a bunch of stuff into the extra file