crud I left stuff uncommitted for a month again, sorry everybody