Rocketbar Updates

WIP - Do not merge.