Still some little glitches on beziers, but close