Filled in enum stuff and got rid of TODOS