Some working test code (mostly trying out comitting some more)