Half way through updating logic layout