slowly adding policy/static handling