Completed Gurads Form

Merging Jude's work so far to master