Starting to refactor code to allow for reuse with collection
Began on test outline