Final update. Project incomplete