user route changes
first pass at user stuff done
added lib
merge fix