Get this working with a more native solution (for linux)