Filled out the module with helpers and stuff