Moved the rest of the stuff out.