Revert "cleanup"

This reverts commit adfaaa0c7fce36f63b4511053f16937e951f049f.
cleanup
cleanup
use 2 circles
fiddling with gestures
get gestures
add more events