Fixing your dumb broken shit

Adding in changes from the old hoggy CBB branch that was loads better