Adding changes to master
Gave up on implementing inline video for now