Adding main and snippet... Need to do some formatting and such
I need to investigate some weirdness on flags:
Otherwise everything is good
Merge branch 'release/dot1'