Renamed window
Added some embryonic classes