All working now with proper metadata transfer