Last update before I head over

Almost done now