Events done

Need tests
Map & window location continue