Refactor some of the Bacbone stuff