Initial add of issues 4 and 5.