not perfect but getting there