MAJOR REWRITE

Too many changes to list. Tabula rasa?