Closed #6: This refactor has been in the work for a few commits now.