Initial work on intro per #21