Pulled core updates over; has *NOT* been tested yet