0.2 - now takes an object