Updated develop module code to reflect new master. Let's proceed from here.