Re-organizing to try & understand why bubbling isn't working