First Draft - Now with all files