Added company
Forgot to commit
UAM initial design
Adjustments