-  Refactor slightly to allow for linux support