More initial work stuff that may never see the light of day. Except here.