more ideas, some reorganization, and equatablebase