Add in some map stuff... yeah.