Added a bunch of classes and windows