Update and rename Window - Draft - DO NOT USE to VerbIdentifier - in Progress

Still a bit messy