Commit from same session as previous.  Completed add function, need to replace constructor and write copy function.