More tinkering with State<>. Use some StateDiffCommands instead of