Moved more stuff from private repo