Made substantial changes to model
Added remove, removeDeep