Delete is now working.
Worked out some more bugs