Dev

Revamp to adjust files to be in sync with new dynamic function system rewrite.