Added beginnings of finalize