working on new cornerstone framework