Major progress on arm code