Simple Harmonic Motion (cont.) and Introduction to Waves