Still a mess, some errors with app package