Started building out client