Moving some variables back for now to fix cycle problems. Also updates to some number classes.