Integrate with UI
Merge branch 'master' of https://github.com/gl0gl0/threadvilleSOA