Initial commit. OSP-2