tbd on additional policies
fix typo
start implementation of policies