User Interactions rework

Better architecture
New user commands added