Simplify, simplify, simplify! Also, add the possibility of a standalone client.