Core almost implemented
Core implemented