Class work + delete feature

- Push the changes we did in the class (+ some clean up)
- Implement the delete feature