Big small update

It compiles now, at least