Final commit before merging

Just making sure the branch is up to date