Merge uv into master (finish UV implementation)