Gubbins as single class
deleted the newwgubbins
merge