Still adding vector improvements, 2D works well, 1D...not so much