-_- I struggled so much to do this refactor that I forgot the original goal......