Moving the code from the shared repo