Ah yeah, good idea. Will work that in when we do proper module definitions after this.