A lot more work been done now, we have a semi-working client