Adding classes works now + tons of other stuff. This commit is waaaay overdue.