Starting over and starting with the key expansion.  This needs to work before testing everything else.