Ar refactored - ready for test