Feature/working app