Added some new structure and commented out old stuff.