Huge strides towards more OOP + the new peenar / kujundus paradigm