Adding all updated files from work done on 9/22