Start work on adapting to larger map