Temp commit. Need to finish delete lister and refactor