Better separation of concerns for windows