More progress #74