Edits after a read through
Fixed merge conflicts
Fixed merge conflicts again