Removed unneccesary friend classes
Started to implement window