First set of changes, fixes #1

Making a commitment to these changes. Slightly new content.