Mod 12

@stefanosc this is a good start. Stay tuned for a more elegant way of handling this. Well done. Overall, well done.