Refactored handlers, added operation queue, added proximity