shoulda fix all bugs . . . now just to make it feature complete