Tests in app, works.
Solve merge conflicts