Incremental checkin. Some builder stuff added.