Working on making things more windows capable