Moved mesh building from system to builder