Window class

Merging window_class to master