Revert "Worked on core."

This reverts commit 0d29a82be9d88f7ed3168d8f501faebb49b092fc.