Initial commit and changes from Andrew's settings.