Working Commit

need to push to master
working commit

almost fished.