Hopefully final refactor of blottery package