Working on compilation errors
Changed the delete method and the move method so it actually works.
merge changes
CLEANUP!!