Move around some Core and MattparksCore features