Commented example implementations to prevent confiusion.
Merge branch 'aae' into fifo