updated

getting there, still a lot to do