mopping up uncommitted files

Majority of work was towards module creation some changes to files... naughty, naughty, very naughty :)