Removing unneeded class
Tidying UI return types
Removing class that is unneeded for now.
Being more explicit about EventApi
Building event assembler
Tidying