Getting closer refs #6