#209 still a few replaces left
#209 new user view