Clean up code
Update code
Merge
Add didTapAtCoordinate funcationality for Swift