Adds to discussion
Second merge from Phillip
Fixes most broken references
Deletes old files
No more undefined references