Scholars core

merging scholars_core into development