Added window and some comments, deliniated design