Intermediate version for testing, and test port to Linux