Passing year into wave, removing extra commented code, removing redundancy
Year is now auto-selecting to displayed year