App mostly finished