More jquery-ifying #57

Will require a manual merge.