Not quite finished

Need to test
removed intersection class