Choco butter ui

Big old merge no 1.