Monoid update: the boring parts
#154
+102
−106
Merged