Updating for assignment

Remind me to never have a merge conflict again...