Remove nasty tuple and use custom struct in stead. Much nicer