Adding OSDs working fine, needs refactoring