huge oserver import and model changes as well