More work on classes and structs