Updated ToDo and moved overworld