App working completely now