* Add test +village2 map
* Add initial work on +village2