Revised files, first working iteration.