work in progress upgrade for BS3 final

Still in the middle of this, just want to make sure I'm going down the correct path.