WyBS: working through updates to the build system.  Almost there, just some niggly stuff to push through.