Revert "Add more stuff to servant branch"

This reverts commit 5086b5f3ff547e57fc73ce605b05861180543770.
Revert "Revert "Add more stuff to servant branch""

This reverts commit 5ccbabb599c88759a70fa2c48454ddf8e5c8a622.