move stuff around, add delete functionality