Client build being worked on now