Finally ridding us of that global mess...componentization here we come\!
Rev'ing BP
Merge branch 'staging'