Mock of first map, major structure refactor