Now this should work for a first version!