adding preliminary version of demo2
cleanup; demo2 animates again; temporarily semi-broke demo1