Basic modulation/clean-up

Merge time.