refactor
add loading indicator to nag