Refactored paths.  Added delete logic.