Amyvs

Refactored the branch, and added jquery.