Taps are now area based
Eveything works!
Merged 'Tabish' with master
Added some visuals