DELETE! DELETE! (and add a few things)