Refactor leap to use new driver and adaptor interfaces