Works now - but we need to make we code beautiful (at least a bit...)