refactored, plateau module and rover module in place