initial commit
fix silly error and add loading indicator