Merging working defaults in to master