Working on bump integration
Updates to make bump work
Merge in bump branch