Start to implement deletion; fix numerous bugs; many things are broken and need fix