Added notes for next rewrite