adding everything as it all stands now