Added some todos for the future.