Pulled .x and .y into a Point class. Simplified a ton of code. Closes #8