Arrgh, forgot to update proto.h with all the changes I have been making.