Finished separating window classes