majority of logic now in place