got rid of final todo - no time to write that function