First real development step

Everything runs fine so far. The changes aren't that big so there is no reason to withhold them from master. More likely the master branch should be pushed forward.