On the road to #11 and #12, critical classes implemented