Lots of work on tests, users. Also added a loading template.