More map work. still not there