Changed over to the module design pattern.