2 new files, 1 improvement and one interrogate/findBy