Added a bunch of modulation

Only partially works. I am not happy.