Map phase2

Lots of worky front end stuff