Add sections and two more todo
Add Server TODO