widgets implemented
Merge branch 'master' of https://github.com/anthonysgevans/GC02