#21, #17 in progress (Upgrade JQuery and use deferred objects)