WIP - lots of changes.  Primary is separation of create and update into individual methods instead of as one save method.  Fixed tests to reflect this.