Yet another refacto. I improved many many mechanisms on this one including dnd. It is now end 2 end tested 🎉
