starting to refactor code to allow individual files to be marked