blargh almost done, so close...