More work on getting it to compile