Flesh out module system a little more