Added more complex types, and a description.
Merged code, added more objects to Olga's stuff