Actuall return everything. Also, rebuild.