Initial runthrough of required changes