First attempt at working waterfall swing code