Added lots of extras, commit to backup.