BIG UPDATE!!!!

Added video attribute. Cleaned up code