Some hacky work on a usable client