Condenses code a bit in anticipation of adding full entang
Full entanglement outline seems to be workin! Nap now?