Resolves #12 and also adds indeterminate counts