New Class structure, print methods
Fix for merge conflict