Added a lot of missing intersection code