Added core + removed first attempt.