todo class and web/public added