Updated maps and todo