Modularized files. Debugging. Keep on transferring code from Shurf::Wax. More tests.