Counting actual nucleotides

This isn't passing all tests and the code needs to be cleaned up
(see TODO comments)