Works with updates now.

Probably tons still to do, but yolo