More work on blade (v2)
add in policy
fixes