More playing around with modules and the such