more modules, more mixing
started on patch implementation