Add modules

These are just more pieces from the original scratchwork src.