Begin to add support for linux machines