kind of reorganized, by accident...  but adding framework parsing capabilities!