Foxiy/class

As I've mentioned earlier `36` worked better for me.