Added a lot of stuff. Ready to integrate live feed