Aesthetic changes to sub extractions
Removing leftover code from original Signals project
Working reconciliation of sub extractions