Merged changes

Needs to be edited for cohesion