almost done...so far so good