Debugging and stuff. Added testdata.

More to come