Reviewed-on: #174
This will make it easier to insert new sections in the middle in the future. Reviewed-on: #169