Incorporated Joe's feedback mechanism

Woo!
Merge pull request #14 from jnguye14/Temp-Jordan

Incorporated Joe's feedback mechanism