mapf - alpha
cleanup
ready for mapff
mapff + tests