Cleaned up, added tests, context processor.