Final merging

Accidentally didn't make sure that everything compiled and worked after
that recent push.