Added several classes (untested)
Added several classes (untested)