Improved build process + started client code