Make mapping better, but is it a problem that a generic actor has a current map? Maybe not?
Add teleport capabilities.
Resolve merge.