Revert "Update to add better handling, fix timing of adding the window class and various tidbits related to the new cloning ability"

This reverts commit 88d64fbae6c4e6b6c5aaa5390ae0bcc022c264b4.
Revert "Revert "Update to add better handling, fix timing of adding the window class and various tidbits related to the new cloning ability""

This reverts commit 7e1c23f5ab78df0fa4a8cfa6a74935ef539710b7.