Starting on fresh implementation
More work on Apnshit2 and tests
Lots of timing fixes