Mrege of local copy into branch
Started making folder classes entirely props driven.