WIP, added proto compat layer, haven't hooked up everything yet