todos to start rewriting sections 10+