Adding policy and adapter classes - nascent and non-functional for now, but going the right direction.