Add refactoring to keep jquerying seperate from prototyping. Fixed spec tests to be as specific as possible.