Several future things to do added