fixed organization abilities - partial
Merge branch 'stage' of github.com:stevemcquaid/boa into stage