Made puzzle for Colma. Roughed out most of the big convo. Started building units for the big battle.