Fixing time
Breaking out into files.