still a work in progress - but getting there