Doing some specific module work

Sorry using this pratically as a drop box right now... Will privatise in
a bit.