- Removed old ember code
- YET MORE CHANGES TO WATER! AHHH (although yes, as always it looks good)