Grand Avenue extension almost ready

Grand Avenue extension almost ready