Moving to a renderer instead of a handler