adding more files, plus change to skeleton