Change concept to "one way street", removed "delete" functions. Unit test completed.