Working on docs and public views