More Area planning and TODOs.