Add owner functionality
Merge Bo and Genevieve's changes