Modetools 57

3 commits for you to consider.