added beginnings of core