Final commit attempt 4

Preparing to merge