Fixed Handlers and ready to test.