more framework-ification!