more work
more work
more work on whammy integration