Added some additional, commented out code that I'm not sure is needed, but wanna save.