Add waves and currency, status bar updates
Merge with aaron_staging