Last commit before deleting all code that's been commented out (unnecessary)