messing with comments
merge
merge
merge
merged
merged
user names with terminals now