Unfinished updates to Class design due to changing OS