Death march

addresses #121, and other general commits. Added additional test code as well