Proabibly going to be doign a major cleanup of code. Ltots of deleting  it seems.