Adds the gibson
Merge branch 'feature/gibson' into develop