This is an intermediate commit...not yet fully implemented the new API...but pushing this so Sam can start addding in the templates