Gwas types

This is the latest edits I have