inital commit, v2
Merge https://github.com/petebp/bp-enhancements