Commiting end of adrians branch in prep for merge