Contact owner functionality added.
Cleaning up. Updating now works much more nicely