Refactoring window types, removing recipient and from references - wip
Refactored all window recipients and types

Tests need fixing
Fixed tests
Removed TODOs