userapp setup
Updated branch to match master