updated todo and began putting new structures in