Re-organizing based on making intro clearer