Incremental modularisation; put unclean states in todo.sls