Initial commit with transform fixes