Adding v2 including rudimentary support for movie and various other minor changes.