copied over content files from content2 branch (which was a recovery branch of stuff from animate)
copying over more changes from content2
think I got most changes from content2