Re: Issue #3 - Rewrote the key tracking code, added tests