Adding some reporting to build. Still needs some tweaks..