Cleaned up

Cleaned up conflicted copies and added in some of the data.