Also as Peter mentioned. Core? What the heck? This should be a plugin.