Boost code compiles, almost done, #18