Remake - more classes + model / better printing