Move around a few bits, get adding/deleting features in place