changed everything to eliminate errors, still hasnt been tested and a
lot has to be chnaged to get to work for us