Clearing up the conflict

Removing old code, adding in new (including heidi's changes)