Rework, fix, add berkshelf