Added a TODO comment to remind me to do some future refactoring