move stuff around, add map