tmp commit with some initial stuff for clients