Made a bunch of changes to migrate to babbage