First part 6 commit

Majority of part 6 done (if not all of it)