Benfrancis 959694 rocketbar

Simply resolving conflicts for now. Do not merge yet.