Server comments and filling in missing logic