added @TODO and a better loading message