In midst of adding google maps api, hash table, many minor changes