Revert bowl changes and add new features

Plus little git derp fix.