Class wrapped, less namespacing issues