Added windows feature and various others