try fixing bug
fixed the problem now cleaning up
fixed it now works and ready to merge