Complete Rework of Project