refresh and minor re-factoring...

refresh is NOT working