Major code drop. Almost where it should be.