Almost have something usable...