google maps working
remove crap
merge
final touches