Updated function prototypes to include reference to policies. Added TODO's where more substantive changes are required. Removed the draft warnings.