Sieve v2 edit

Continued work on the sieve