Window class extended
NN changes

**computer crashed? backup complete**