made a few more changes to code, but still needs alot of work