tapping stuff now makes stuff hide if its outside
asdf
Merge remote-tracking branch 'origin/eric' into bala