started re architecting core