0.0.46.x1

Still some things broken.