Fixed Windows build; implementation in-progress.