Continue working on core code