Added custom context test. Made internal tracker methods private.
Started writing comments.