client: hacky version now has 2 sources and works