asmblah/dynamic 1 merged

• CSP support Jul 5