Adding Ian's branch with jasmine testing.