Andrew/refresh

pull to refresh. merge other PR's before reviewing this one