Progress Report

Very close to a testbuild. The contents are pretty much all there. Just need to glue them together, patching some holes and error.