Fixed a bug with reading from the grapevine.
Merge branch 'user/LoganEvans-structure' into dev-integration