commands and routing logic
Fixed merging
get current user
preping merge with master