Added some todo's (e.g. input filename housekeeping and file dependency extraction)