got rid of some of the todo's