Boeffla changes
Bunch of new stuff