moved some files around. Still a bit choppy, because of variable time deltas