cleaned it up
almost working but g2g