and @ejohnson44 will refactor because she is working in that file