Merge pull request #4 from jnguye14/Jordan-Temp

Jordan temp
Merge pull request #5 from jnguye14/Jordan-Temp

put test back
adjustments
clean up