Overhaul the whole project