Almost done still some things are left yet