Class structure now works.