Finalised delete and modify framework, need to thoroughly test, yet.