Lots of headway, nearly there. Some issues with follow set generation copying over to map