more conversion changes. still doesn't build.