Started wrapping map and terrain classes.