Yet another branch

latest from cfn as of may 12 copied manually