add 2 phases animation and gesture refactoring
fix by commenting go to stuff
remove comments, not needed anymore