Adding in code from private repo