Added: A lot of TODOs and comments for the server