merge ronf's branch 

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