First pass working in app