Bubba1 -> Master #1

no real changes so yeah. gonna merge these