Sr givie integration

Redoing this pull request for Givie integration because I had it on the wrong branch before.