Not done yet but getting there