Handling basic requests

TODO updates