Base Update #3

Yet another base update. I got a bit lazy and slacked off. Need to stop
doing that.