About to rebuild a portion of the deletion code :(