All working except image persistence