Feature/maj 18 01

Don't merge before we have found a solution for #54 #63 #65 #66 and #71