Annas branch

Sending this pull request hoping that this will solve our merge conflict.