Feature owner concern

Just some stuff to make the owned/owner relationship a little easier.