I kinda botched this... now it's a shipp.