Refactor in preparation for adding samples