Some backend extension work to facilitate good things to come.