First attempt at dual os builds