Done except for Jasmine testing