more core code completed