final merge-... this app sucks