Parallax branch

added new branch with test files