Wave 3

Final...for hackathon