Add April 1 RFCs

I also made a few minor syntax tweaks to get this to compile on my box.