Rocketbar stage

Do not merge yet. Opening this to track remaining items that need to be merged into master.