WIP building a bridge for 1.1