#37 - Greatly simplified the class section since it seems like it's too much effort and maintenance to support it properly...not to mention legally a grey area....as a result this undoes the changes performed in #16