almost done, up for review