Resolve silly merge conflict
Add basic clientness