Filled in todo's