Restructure 3

switching to bummp