Moving to a module to fit with the station API