User management to be pulled in as a separate branch