gathered and preparing to refactor