Intra-map movement!

closes #4