Added a few more classes, added the default frame