Initial commit
Initial
Making 'delete' work
Test
Fixed merge conflict