Move OS constancy and checking code to new class