Continued work on App