Initial in-progress build of OO client