Backtracking

Removed the animation and extra stuff. Testing for drag and drop on
emulator