Added todo
Updates to MSState. Effects now initialised in stages.