Pretty much done, committing to test on Linux nodes