Added some comments to help me remember some things to fix.