cleaned up services and added timer module