WIP arm refactoring