Refactor
Remaining primes work
Refactor out redundency