Mac os x working, need to test windows