Added comments and file listing (not formatted yet)