Added some comments that clearly mark the outdated, still to be rewriten bits