Resolution as an object, instead of a hash
Using mustache for templating
Using mustache for templating
Added option when not selected