Update - Everything working except nay/refresh function