First attempt at a delete, still contains bugs