Many changes, app works sorta