Commented out some code that isn't used since everything is an element struct now.  I would delete but would like to discuss it first