Updated to Weaver 0.4.0, and updated code to support.

Solution does not fully compile.