arrow refactoring almost done; just need to selectively mamke them appear