merged

• waterbeds
• endorsers
• moments
• masterstrokes
• Pole
• oscillator