Add new terrain and remove old

@BrettASwift, @kadst43, @scottnc27603, @ajiraffe, would you mind reviewing?