Added missing files from last commit. Work on integrating live data