This Version actually works :) Also cleaned it up a bit.