removed hardcoded path
working on fixing things up
merging