switch from clases to modules
add waggit pull