Controller in progress
merge with ubuntu machine