Created Boss, buttons, and such
Boss, buttons and more, after merge fixes