Added classes, printing works a bit