nearly all of 2d works still tracking down 1 dumb bug