Added beginnings of OS agnosticity