Started to make this work on Linux.