Begun integrating monitor and window.
32 files changed