Completely re-merged BL
Fix a crash
Add package accessors