More work in getting it to compile