Sake Bomb Phase 3

Creating a branch inside the main repo so we have a central source for this branch.