A ton of changes. Prototype 2 working with map and db.