Cleaned code up and began intersection calculations