Wading through existing functionality to re-org for future changes