update

Almost fully workable App