Adds preliminary waterfall art.
Fixes merge