now with CDFs
Everything works, and I am mostly sure it is all correct...