Seems To work reasonably well with itself now