start porting some things over from the Common file into a service type class