Merged app files. Tests not passing.