Refactor

Amendments to insert, delete and discard. All constructors