App working. Major changes