Whole Buncha code Incoming

And still a whole lot more to go.