Added some multiple intents. Need to test. Tidied up some files