Starting to add functionality for REU detection etc.