Done some progress in transfering old project