Adding intersection testing
More work