TODOS FOR #118