Add *very* experimental dynamic functionality