Solved another problem...it's kind of ugly though?