working brightcove
working
update stuff
cleanup
merge