Finish converting working code to new platform style