yep, part of the refactor