big refactor of windows models