lots of functionality added
Adding in files that wern't 'alled'