Pre 1.1

DO NOT MERGE!!! Opening for visibility into changes.