Added simple integration and substitution. Need to add more integration features and concurrent substitution