Finish conversion from Fllat to Prequel

Finish converting functions and testing