Lots of refactoring. Calculating coverings works now!