Adjusted preprocessor switch checks
Tidied old code
Completed SRQ system ready for test