TODO fixes --working