nearly all working, small sections to complete. iPad test to follow