ending for the day have to fix issue #70 amd #71