Adding better sample bodies
Adding a todo header