Merge of Ron's IP2.5 testing branch 

This code is being used for testing and will eventually need to be merged into the integration branch