beta of #5
Restructure.