Can save day again but need to figure out refreshing bug
Merge remote-tracking branch 'origin/master'