merge
some windows stuff?