Major changes, added most map functionality, Cleaned up code, just needs zoom to for search regions