Defaults
Stubbing out configuration files
Renamed
Adding in core and Klass methods
Merge branch 'develop'